blob: 3e76e99f38f67a530d43e2da3b3129c2a99e3366 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:231git-push(1)
2===========
3
4NAME
5----
Junio C Hamano01078922006-03-10 00:31:476git-push - Update remote refs along with associated objects
Junio C Hamano1a4e8412005-12-27 08:17:237
8
9SYNOPSIS
10--------
Junio C Hamanoa9b8d242007-05-19 04:51:5511[verse]
Junio C Hamano6bb32e62015-02-17 22:11:2612'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]
Junio C Hamanoa7da1ba2016-01-13 00:19:4513 [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]
Junio C Hamanoe48a1132016-08-03 22:40:2114 [-u | --set-upstream] [--push-option=<string>]
Junio C Hamano4b2a6c12017-08-22 18:32:3715 [--[no-]signed|--signed=(true|false|if-asked)]
Junio C Hamano8eac2682013-09-09 22:35:2016 [--force-with-lease[=<refname>[:<expect>]]]
Junio C Hamanodc8f8de2013-06-05 22:58:0717 [--no-verify] [<repository> [<refspec>...]]
Junio C Hamano1a4e8412005-12-27 08:17:2318
19DESCRIPTION
20-----------
21
22Updates remote refs using local refs, while sending objects
23necessary to complete the given refs.
24
Junio C Hamano40f2f8d2006-02-07 08:04:3925You can make interesting things happen to a repository
Junio C Hamano1a4e8412005-12-27 08:17:2326every time you push into it, by setting up 'hooks' there. See
Junio C Hamano35738e82008-01-07 07:55:4627documentation for linkgit:git-receive-pack[1].
Junio C Hamano1a4e8412005-12-27 08:17:2328
Junio C Hamano5e7f1312013-03-21 22:49:0129When the command line does not specify where to push with the
30`<repository>` argument, `branch.*.remote` configuration for the
31current branch is consulted to determine where to push. If the
32configuration is missing, it defaults to 'origin'.
33
34When the command line does not specify what to push with `<refspec>...`
35arguments or `--all`, `--mirror`, `--tags` options, the command finds
36the default `<refspec>` by consulting `remote.*.push` configuration,
37and if it is not found, honors `push.default` configuration to decide
Junio C Hamanoe3b2b332014-12-12 23:34:5338what to push (See linkgit:git-config[1] for the meaning of `push.default`).
Junio C Hamano5e7f1312013-03-21 22:49:0139
Junio C Hamano76df4f72016-02-26 22:13:1040When neither the command-line nor the configuration specify what to
41push, the default behavior is used, which corresponds to the `simple`
42value for `push.default`: the current branch is pushed to the
43corresponding upstream branch, but as a safety measure, the push is
44aborted if the upstream branch does not have the same name as the
45local one.
46
Junio C Hamano1a4e8412005-12-27 08:17:2347
Junio C Hamanoea82cff2009-03-18 01:54:4848OPTIONS[[OPTIONS]]
49------------------
Junio C Hamano40f2f8d2006-02-07 08:04:3950<repository>::
51The "remote" repository that is destination of a push
Junio C Hamanocc0cb312009-01-22 03:38:5052operation. This parameter can be either a URL
53(see the section <<URLS,GIT URLS>> below) or the name
54of a remote (see the section <<REMOTES,REMOTES>> below).
Junio C Hamano40f2f8d2006-02-07 08:04:3955
Junio C Hamano7f80ae82008-07-30 18:31:3556<refspec>...::
Junio C Hamano5e7f1312013-03-21 22:49:0157Specify what destination ref to update with what source object.
Junio C Hamano8b6e23b2009-02-01 06:36:0858The format of a <refspec> parameter is an optional plus
Junio C Hamano5e7f1312013-03-21 22:49:0159`+`, followed by the source object <src>, followed
Junio C Hamano8b6e23b2009-02-01 06:36:0860by a colon `:`, followed by the destination ref <dst>.
Junio C Hamano40f2f8d2006-02-07 08:04:3961+
Junio C Hamano8b6e23b2009-02-01 06:36:0862The <src> is often the name of the branch you would want to push, but
63it can be any arbitrary "SHA-1 expression", such as `master~4` or
Junio C Hamanoc27b7332010-10-14 04:37:2864`HEAD` (see linkgit:gitrevisions[7]).
Junio C Hamano40f2f8d2006-02-07 08:04:3965+
Junio C Hamano8b6e23b2009-02-01 06:36:0866The <dst> tells which ref on the remote side is updated with this
67push. Arbitrary expressions cannot be used here, an actual ref must
Junio C Hamanob1acf022013-12-28 00:33:1668be named.
69If `git push [<repository>]` without any `<refspec>` argument is set to
70update some ref at the destination with `<src>` with
71`remote.<repository>.push` configuration variable, `:<dst>` part can
Junio C Hamanoee615802015-10-29 21:45:2672be omitted--such a push will update a ref that `<src>` normally updates
Junio C Hamanob1acf022013-12-28 00:33:1673without any `<refspec>` on the command line. Otherwise, missing
74`:<dst>` means to update the same ref as the `<src>`.
Junio C Hamano8b6e23b2009-02-01 06:36:0875+
Junio C Hamanod533bdb2009-02-25 09:56:5876The object referenced by <src> is used to update the <dst> reference
Junio C Hamanoabad6da2013-01-06 09:06:3277on the remote side. By default this is only allowed if <dst> is not
78a tag (annotated or lightweight), and then only if it can fast-forward
Junio C Hamano076ffcc2013-02-06 05:13:2179<dst>. By having the optional leading `+`, you can tell Git to update
Junio C Hamanoabad6da2013-01-06 09:06:3280the <dst> ref even if it is not allowed by default (e.g., it is not a
81fast-forward.) This does *not* attempt to merge <src> into <dst>. See
Junio C Hamanod533bdb2009-02-25 09:56:5882EXAMPLES below for details.
Junio C Hamano40f2f8d2006-02-07 08:04:3983+
Junio C Hamano3f403b02006-12-13 10:14:1384`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
Junio C Hamano40f2f8d2006-02-07 08:04:3985+
Junio C Hamano3f403b02006-12-13 10:14:1386Pushing an empty <src> allows you to delete the <dst> ref from
87the remote repository.
Junio C Hamanob713ff12008-05-24 01:12:3088+
Junio C Hamanob76a6862012-05-02 22:02:4689The special refspec `:` (or `+:` to allow non-fast-forward updates)
Junio C Hamano076ffcc2013-02-06 05:13:2190directs Git to push "matching" branches: for every branch that exists on
Junio C Hamanocc0cb312009-01-22 03:38:5091the local side, the remote side is updated if a branch of the same name
Junio C Hamano5e7f1312013-03-21 22:49:0192already exists on the remote side.
Junio C Hamano1a4e8412005-12-27 08:17:2393
Junio C Hamanoeb415992008-06-08 22:49:4794--all::
Junio C Hamano1d669b82014-03-11 21:36:0095Push all branches (i.e. refs under `refs/heads/`); cannot be
96used with other <refspec>.
Junio C Hamano1a4e8412005-12-27 08:17:2397
Junio C Hamanof54f08e2012-02-27 07:49:1998--prune::
99Remove remote branches that don't have a local counterpart. For example
100a remote branch `tmp` will be removed if a local branch with the same
101name doesn't exist any more. This also respects refspecs, e.g.
Junio C Hamanob76a6862012-05-02 22:02:46102`git push --prune remote refs/heads/*:refs/tmp/*` would
Junio C Hamanof54f08e2012-02-27 07:49:19103make sure that remote `refs/tmp/foo` will be removed if `refs/heads/foo`
104doesn't exist.
105
Junio C Hamanoeb415992008-06-08 22:49:47106--mirror::
Junio C Hamano9d2bbb72007-11-25 04:56:07107Instead of naming each ref to push, specifies that all
Junio C Hamano4fdccb22010-02-19 09:58:14108refs under `refs/` (which includes but is not
Junio C Hamanoa351d142008-06-21 09:40:40109limited to `refs/heads/`, `refs/remotes/`, and `refs/tags/`)
Junio C Hamano9d2bbb72007-11-25 04:56:07110be mirrored to the remote repository. Newly created local
111refs will be pushed to the remote end, locally updated refs
112will be force updated on the remote end, and deleted refs
Junio C Hamano47d68a52008-05-06 06:35:40113will be removed from the remote end. This is the default
114if the configuration option `remote.<remote>.mirror` is
115set.
Junio C Hamano9d2bbb72007-11-25 04:56:07116
Junio C Hamanod6fff402009-09-14 09:40:50117-n::
Junio C Hamanoeb415992008-06-08 22:49:47118--dry-run::
Junio C Hamano764a6672007-10-23 01:23:31119Do everything except actually send the updates.
120
Junio C Hamano48bc1ce2009-07-09 16:49:19121--porcelain::
122Produce machine-readable output. The output status line for each ref
123will be tab-separated and sent to stdout instead of stderr. The full
124symbolic names of the refs will be given.
125
Junio C Hamanob141a922010-01-10 19:55:14126--delete::
127All listed refs are deleted from the remote repository. This is
128the same as prefixing all refs with a colon.
129
Junio C Hamanoeb415992008-06-08 22:49:47130--tags::
Junio C Hamano4fdccb22010-02-19 09:58:14131All refs under `refs/tags` are pushed, in
Junio C Hamano02d6fa52006-01-16 08:23:23132addition to refspecs explicitly listed on the command
133line.
134
Junio C Hamano240dc3f2013-03-25 23:37:03135--follow-tags::
136Push all the refs that would be pushed without this option,
137and also push annotated tags in `refs/tags` that are missing
Junio C Hamanoe6f28d02013-09-17 21:34:00138from the remote but are pointing at commit-ish that are
Junio C Hamano322c6242015-03-23 21:32:46139reachable from the refs being pushed. This can also be specified
Junio C Hamano042f2142016-06-27 18:05:05140with configuration variable `push.followTags`. For more
141information, see `push.followTags` in linkgit:git-config[1].
Junio C Hamano322c6242015-03-23 21:32:46142
Junio C Hamano3891e252015-08-31 23:06:13143--[no-]signed::
Junio C Hamano4b2a6c12017-08-22 18:32:37144--signed=(true|false|if-asked)::
Junio C Hamano9236fea2014-10-14 22:28:09145GPG-sign the push request to update refs on the receiving
146side, to allow it to be checked by the hooks and/or be
Junio C Hamano3891e252015-08-31 23:06:13147logged. If `false` or `--no-signed`, no signing will be
148attempted. If `true` or `--signed`, the push will fail if the
149server does not support signed pushes. If set to `if-asked`,
150sign if and only if the server supports signed pushes. The push
151will also fail if the actual call to `gpg --sign` fails. See
152linkgit:git-receive-pack[1] for the details on the receiving end.
Junio C Hamano9236fea2014-10-14 22:28:09153
Junio C Hamano6bb32e62015-02-17 22:11:26154--[no-]atomic::
155Use an atomic transaction on the remote side if available.
156Either all refs are updated, or on error, no refs are updated.
157If the server does not support atomic pushes the push will fail.
158
Junio C Hamanoe48a1132016-08-03 22:40:21159-o::
160--push-option::
161Transmit the given string to the server, which passes them to
162the pre-receive as well as the post-receive hook. The given string
163must not contain a NUL or LF character.
164
Junio C Hamanoeb415992008-06-08 22:49:47165--receive-pack=<git-receive-pack>::
Junio C Hamano1c958272009-01-12 18:04:21166--exec=<git-receive-pack>::
Junio C Hamanoba4b9282008-07-06 05:20:31167Path to the 'git-receive-pack' program on the remote
Junio C Hamano1ce39ab2007-01-16 22:05:10168end. Sometimes useful when pushing to a remote
169repository over ssh, and you do not have the program in
170a directory on the default $PATH.
171
Junio C Hamano8eac2682013-09-09 22:35:20172--[no-]force-with-lease::
173--force-with-lease=<refname>::
174--force-with-lease=<refname>:<expect>::
175Usually, "git push" refuses to update a remote ref that is
176not an ancestor of the local ref used to overwrite it.
177+
Junio C Hamanoba423bd2015-03-28 18:18:17178This option overrides this restriction if the current value of the
179remote ref is the expected value. "git push" fails otherwise.
Junio C Hamano8eac2682013-09-09 22:35:20180+
181Imagine that you have to rebase what you have already published.
182You will have to bypass the "must fast-forward" rule in order to
183replace the history you originally published with the rebased history.
184If somebody else built on top of your original history while you are
185rebasing, the tip of the branch at the remote may advance with her
186commit, and blindly pushing with `--force` will lose her work.
187+
188This option allows you to say that you expect the history you are
189updating is what you rebased and want to replace. If the remote ref
190still points at the commit you specified, you can be sure that no
Junio C Hamanoba423bd2015-03-28 18:18:17191other people did anything to the ref. It is like taking a "lease" on
192the ref without explicitly locking it, and the remote ref is updated
193only if the "lease" is still valid.
Junio C Hamano8eac2682013-09-09 22:35:20194+
195`--force-with-lease` alone, without specifying the details, will protect
196all remote refs that are going to be updated by requiring their
197current value to be the same as the remote-tracking branch we have
Junio C Hamanoba423bd2015-03-28 18:18:17198for them.
Junio C Hamano8eac2682013-09-09 22:35:20199+
200`--force-with-lease=<refname>`, without specifying the expected value, will
201protect the named ref (alone), if it is going to be updated, by
202requiring its current value to be the same as the remote-tracking
203branch we have for it.
204+
205`--force-with-lease=<refname>:<expect>` will protect the named ref (alone),
206if it is going to be updated, by requiring its current value to be
Junio C Hamanoaf182942016-08-10 20:46:26207the same as the specified value `<expect>` (which is allowed to be
Junio C Hamano8eac2682013-09-09 22:35:20208different from the remote-tracking branch we have for the refname,
209or we do not even have to have such a remote-tracking branch when
Junio C Hamanoaf182942016-08-10 20:46:26210this form is used). If `<expect>` is the empty string, then the named ref
211must not already exist.
Junio C Hamano8eac2682013-09-09 22:35:20212+
213Note that all forms other than `--force-with-lease=<refname>:<expect>`
214that specifies the expected current value of the ref explicitly are
215still experimental and their semantics may change as we gain experience
216with this feature.
217+
218"--no-force-with-lease" will cancel all the previous --force-with-lease on the
219command line.
Junio C Hamanobeca3402017-04-27 02:21:51220+
221A general note on safety: supplying this option without an expected
222value, i.e. as `--force-with-lease` or `--force-with-lease=<refname>`
223interacts very badly with anything that implicitly runs `git fetch` on
224the remote to be pushed to in the background, e.g. `git fetch origin`
225on your repository in a cronjob.
226+
227The protection it offers over `--force` is ensuring that subsequent
228changes your work wasn't based on aren't clobbered, but this is
229trivially defeated if some background process is updating refs in the
230background. We don't have anything except the remote tracking info to
231go by as a heuristic for refs you're expected to have seen & are
232willing to clobber.
233+
234If your editor or some other system is running `git fetch` in the
235background for you a way to mitigate this is to simply set up another
236remote:
237+
238git remote add origin-push $(git config remote.origin.url)
239git fetch origin-push
240+
241Now when the background process runs `git fetch origin` the references
242on `origin-push` won't be updated, and thus commands like:
243+
244git push --force-with-lease origin-push
245+
246Will fail unless you manually run `git fetch origin-push`. This method
247is of course entirely defeated by something that runs `git fetch
248--all`, in that case you'd need to either disable it or do something
249more tedious like:
250+
251git fetch # update 'master' from remote
252git tag base master # mark our base point
253git rebase -i master # rewrite some commits
254git push --force-with-lease=master:base master:master
255+
256I.e. create a `base` tag for versions of the upstream code that you've
257seen and are willing to overwrite, then rewrite history, and finally
258force push changes to `master` if the remote version is still at
259`base`, regardless of what your local `remotes/origin/master` has been
260updated to in the background.
Junio C Hamano8eac2682013-09-09 22:35:20261
Junio C Hamanoeb415992008-06-08 22:49:47262-f::
263--force::
Junio C Hamano560a1f62006-01-30 04:19:57264Usually, the command refuses to update a remote ref that is
Junio C Hamano4cd1c0e2007-08-06 04:39:14265not an ancestor of the local ref used to overwrite it.
Junio C Hamano8eac2682013-09-09 22:35:20266Also, when `--force-with-lease` option is used, the command refuses
267to update a remote ref whose current value does not match
268what is expected.
269+
270This flag disables these checks, and can cause the remote repository
271to lose commits; use it with care.
272+
273Note that `--force` applies to all the refs that are pushed, hence
274using it with `push.default` set to `matching` or with multiple push
275destinations configured with `remote.*.push` may overwrite refs
276other than the current branch (including local refs that are
277strictly behind their remote counterpart). To force a push to only
278one branch, use a `+` in front of the refspec to push (e.g `git push
279origin +master` to force a push to the `master` branch). See the
280`<refspec>...` section above for details.
Junio C Hamano1a4e8412005-12-27 08:17:23281
Junio C Hamanoa476efa2008-10-10 15:31:42282--repo=<repository>::
Junio C Hamano6bb32e62015-02-17 22:11:26283This option is equivalent to the <repository> argument. If both
284are specified, the command-line argument takes precedence.
Junio C Hamano1ce39ab2007-01-16 22:05:10285
Junio C Hamanod0d892c2010-01-24 20:06:29286-u::
287--set-upstream::
288For every branch that is up to date or successfully pushed, add
289upstream (tracking) reference, used by argument-less
290linkgit:git-pull[1] and other commands. For more information,
Junio C Hamano042f2142016-06-27 18:05:05291see `branch.<name>.merge` in linkgit:git-config[1].
Junio C Hamanod0d892c2010-01-24 20:06:29292
Junio C Hamano3d1b5a12013-05-17 23:34:02293--[no-]thin::
Junio C Hamano4fdccb22010-02-19 09:58:14294These options are passed to linkgit:git-send-pack[1]. A thin transfer
295significantly reduces the amount of sent data when the sender and
296receiver share many of the same objects in common. The default is
297\--thin.
Junio C Hamano1ce39ab2007-01-16 22:05:10298
Junio C Hamanoea90ab32010-03-15 20:32:55299-q::
300--quiet::
301Suppress all output, including the listing of updated refs,
302unless an error occurs. Progress is not reported to the standard
303error stream.
304
Junio C Hamanoeb415992008-06-08 22:49:47305-v::
306--verbose::
Junio C Hamano1ce39ab2007-01-16 22:05:10307Run verbosely.
308
Junio C Hamanoea90ab32010-03-15 20:32:55309--progress::
310Progress status is reported on the standard error stream
311by default when it is attached to a terminal, unless -q
312is specified. This flag forces progress status even if the
313standard error stream is not directed to a terminal.
Junio C Hamano3d23a0a2009-10-19 08:04:30314
Junio C Hamano409a33a2015-12-22 23:45:23315--no-recurse-submodules::
Junio C Hamanoe89102f2017-02-15 23:18:15316--recurse-submodules=check|on-demand|only|no::
Junio C Hamano409a33a2015-12-22 23:45:23317May be used to make sure all submodule commits used by the
318revisions to be pushed are available on a remote-tracking branch.
319If 'check' is used Git will verify that all submodule commits that
320changed in the revisions to be pushed are available on at least one
321remote of the submodule. If any commits are missing the push will
322be aborted and exit with non-zero status. If 'on-demand' is used
323all submodules that changed in the revisions to be pushed will be
Junio C Hamanoe89102f2017-02-15 23:18:15324pushed. If on-demand was not able to push all necessary revisions it will
325also be aborted and exit with non-zero status. If 'only' is used all
326submodules will be recursively pushed while the superproject is left
327unpushed. A value of 'no' or using `--no-recurse-submodules` can be used
328to override the push.recurseSubmodules configuration variable when no
329submodule recursion is required.
Junio C Hamano7bd050f2011-09-22 06:32:22330
Junio C Hamanodc8f8de2013-06-05 22:58:07331--[no-]verify::
332Toggle the pre-push hook (see linkgit:githooks[5]). The
Junio C Hamano1dbca522015-05-22 20:48:55333default is --verify, giving the hook a chance to prevent the
334push. With --no-verify, the hook is bypassed completely.
Junio C Hamanodc8f8de2013-06-05 22:58:07335
Junio C Hamano3fcdd072016-02-24 23:41:08336-4::
337--ipv4::
338Use IPv4 addresses only, ignoring IPv6 addresses.
339
340-6::
341--ipv6::
342Use IPv6 addresses only, ignoring IPv4 addresses.
Junio C Hamano7bd050f2011-09-22 06:32:22343
Junio C Hamano330aae62007-07-06 17:01:58344include::urls-remotes.txt[]
Junio C Hamano1a4e8412005-12-27 08:17:23345
Junio C Hamano6d559fc2008-02-20 10:44:26346OUTPUT
347------
348
349The output of "git push" depends on the transport method used; this
Junio C Hamano076ffcc2013-02-06 05:13:21350section describes the output when pushing over the Git protocol (either
Junio C Hamano6d559fc2008-02-20 10:44:26351locally or via ssh).
352
353The status of the push is output in tabular form, with each line
354representing the status of a single ref. Each line is of the form:
355
356-------------------------------
357 <flag> <summary> <from> -> <to> (<reason>)
358-------------------------------
359
Junio C Hamano48bc1ce2009-07-09 16:49:19360If --porcelain is used, then each line of the output is of the form:
361
362-------------------------------
363 <flag> \t <from>:<to> \t <summary> (<reason>)
364-------------------------------
365
Junio C Hamano78b92a82010-02-09 07:34:13366The status of up-to-date refs is shown only if --porcelain or --verbose
367option is used.
368
Junio C Hamano6d559fc2008-02-20 10:44:26369flag::
Junio C Hamano78b92a82010-02-09 07:34:13370A single character indicating the status of the ref:
371(space);; for a successfully pushed fast-forward;
Junio C Hamanob76a6862012-05-02 22:02:46372`+`;; for a successful forced update;
Junio C Hamano78b92a82010-02-09 07:34:13373`-`;; for a successfully deleted ref;
374`*`;; for a successfully pushed new ref;
375`!`;; for a ref that was rejected or failed to push; and
376`=`;; for a ref that was up to date and did not need pushing.
Junio C Hamano6d559fc2008-02-20 10:44:26377
378summary::
379For a successfully pushed ref, the summary shows the old and new
380values of the ref in a form suitable for using as an argument to
381`git log` (this is `<old>..<new>` in most cases, and
Junio C Hamanob76a6862012-05-02 22:02:46382`<old>...<new>` for forced non-fast-forward updates).
Junio C Hamanob4448a82010-07-26 09:02:32383+
384For a failed update, more details are given:
385+
386--
387rejected::
388Git did not try to send the ref at all, typically because it
389is not a fast-forward and you did not force the update.
390
391remote rejected::
392The remote end refused the update. Usually caused by a hook
393on the remote side, or because the remote repository has one
394of the following safety options in effect:
395`receive.denyCurrentBranch` (for pushes to the checked out
396branch), `receive.denyNonFastForwards` (for forced
397non-fast-forward updates), `receive.denyDeletes` or
398`receive.denyDeleteCurrent`. See linkgit:git-config[1].
399
400remote failure::
401The remote end did not report the successful update of the ref,
402perhaps because of a temporary error on the remote side, a
403break in the network connection, or other transient error.
404--
Junio C Hamano6d559fc2008-02-20 10:44:26405
406from::
407The name of the local ref being pushed, minus its
408`refs/<type>/` prefix. In the case of deletion, the
409name of the local ref is omitted.
410
411to::
412The name of the remote ref being updated, minus its
413`refs/<type>/` prefix.
414
415reason::
416A human-readable explanation. In the case of successfully pushed
417refs, no explanation is needed. For a failed ref, the reason for
418failure is described.
Junio C Hamano6926bef2007-06-16 09:54:05419
Junio C Hamano27a128b2009-08-13 01:23:00420Note about fast-forwards
421------------------------
422
423When an update changes a branch (or more in general, a ref) that used to
424point at commit A to point at another commit B, it is called a
425fast-forward update if and only if B is a descendant of A.
426
427In a fast-forward update from A to B, the set of commits that the original
428commit A built on top of is a subset of the commits the new commit B
429builds on top of. Hence, it does not lose any history.
430
431In contrast, a non-fast-forward update will lose history. For example,
432suppose you and somebody else started at the same commit X, and you built
433a history leading to commit B while the other person built a history
434leading to commit A. The history looks like this:
435
436----------------
437
438 B
439 /
440 ---X---A
441
442----------------
443
444Further suppose that the other person already pushed changes leading to A
Junio C Hamano70e980e2012-11-27 21:53:29445back to the original repository from which you two obtained the original
446commit X.
Junio C Hamano27a128b2009-08-13 01:23:00447
448The push done by the other person updated the branch that used to point at
449commit X to point at commit A. It is a fast-forward.
450
451But if you try to push, you will attempt to update the branch (that
452now points at A) with commit B. This does _not_ fast-forward. If you did
453so, the changes introduced by commit A will be lost, because everybody
454will now start building on top of B.
455
456The command by default does not allow an update that is not a fast-forward
457to prevent such loss of history.
458
Junio C Hamanod75148a2014-04-08 19:48:38459If you do not want to lose your work (history from X to B) or the work by
Junio C Hamano27a128b2009-08-13 01:23:00460the other person (history from X to A), you would need to first fetch the
461history from the repository, create a history that contains changes done
462by both parties, and push the result back.
463
464You can perform "git pull", resolve potential conflicts, and "git push"
465the result. A "git pull" will create a merge commit C between commits A
466and B.
467
468----------------
469
470 B---C
471 / /
472 ---X---A
473
474----------------
475
476Updating A with the resulting merge commit will fast-forward and your
477push will be accepted.
478
479Alternatively, you can rebase your change between X and B on top of A,
480with "git pull --rebase", and push the result back. The rebase will
481create a new commit D that builds the change between X and B on top of
482A.
483
484----------------
485
486 B D
487 / /
488 ---X---A
489
490----------------
491
492Again, updating A with this commit will fast-forward and your push will be
493accepted.
494
495There is another common situation where you may encounter non-fast-forward
496rejection when you try to push, and it is possible even when you are
497pushing into a repository nobody else pushes into. After you push commit
498A yourself (in the first picture in this section), replace it with "git
499commit --amend" to produce commit B, and you try to push it out, because
500forgot that you have pushed A out already. In such a case, and only if
501you are certain that nobody in the meantime fetched your earlier commit A
502(and started building on top of it), you can run "git push --force" to
503overwrite it. In other words, "git push --force" is a method reserved for
504a case where you do mean to lose history.
505
506
Junio C Hamano6926bef2007-06-16 09:54:05507Examples
508--------
509
Junio C Hamano16ebcd02011-08-05 00:05:45510`git push`::
Junio C Hamanoea82cff2009-03-18 01:54:48511Works like `git push <remote>`, where <remote> is the
512current branch's remote (or `origin`, if no remote is
513configured for the current branch).
514
Junio C Hamano16ebcd02011-08-05 00:05:45515`git push origin`::
Junio C Hamano1d669b82014-03-11 21:36:00516Without additional configuration, pushes the current branch to
517the configured upstream (`remote.origin.merge` configuration
518variable) if it has the same name as the current branch, and
519errors out without pushing otherwise.
Junio C Hamanoea82cff2009-03-18 01:54:48520+
521The default behavior of this command when no <refspec> is given can be
Junio C Hamanocb857f22012-10-02 22:50:01522configured by setting the `push` option of the remote, or the `push.default`
523configuration variable.
Junio C Hamanoea82cff2009-03-18 01:54:48524+
525For example, to default to pushing only the current branch to `origin`
526use `git config remote.origin.push HEAD`. Any valid <refspec> (like
527the ones in the examples below) can be configured as the default for
528`git push origin`.
529
Junio C Hamano16ebcd02011-08-05 00:05:45530`git push origin :`::
Junio C Hamanoea82cff2009-03-18 01:54:48531Push "matching" branches to `origin`. See
532<refspec> in the <<OPTIONS,OPTIONS>> section above for a
533description of "matching" branches.
534
Junio C Hamano16ebcd02011-08-05 00:05:45535`git push origin master`::
Junio C Hamano6926bef2007-06-16 09:54:05536Find a ref that matches `master` in the source repository
537(most likely, it would find `refs/heads/master`), and update
538the same ref (e.g. `refs/heads/master`) in `origin` repository
Junio C Hamanoa9aee782008-04-23 16:09:20539with it. If `master` did not exist remotely, it would be
540created.
Junio C Hamano6926bef2007-06-16 09:54:05541
Junio C Hamano16ebcd02011-08-05 00:05:45542`git push origin HEAD`::
Junio C Hamano8b6e23b2009-02-01 06:36:08543A handy way to push the current branch to the same name on the
544remote.
Junio C Hamano6926bef2007-06-16 09:54:05545
Junio C Hamanobccb0db2012-11-29 22:51:20546`git push mothership master:satellite/master dev:satellite/dev`::
Junio C Hamano7f80ae82008-07-30 18:31:35547Use the source ref that matches `master` (e.g. `refs/heads/master`)
548to update the ref that matches `satellite/master` (most probably
Junio C Hamanobccb0db2012-11-29 22:51:20549`refs/remotes/satellite/master`) in the `mothership` repository;
Junio C Hamano7f80ae82008-07-30 18:31:35550do the same for `dev` and `satellite/dev`.
Junio C Hamanobccb0db2012-11-29 22:51:20551+
552This is to emulate `git fetch` run on the `mothership` using `git
553push` that is run in the opposite direction in order to integrate
554the work done on `satellite`, and is often necessary when you can
555only make connection in one way (i.e. satellite can ssh into
556mothership but mothership cannot initiate connection to satellite
557because the latter is behind a firewall or does not run sshd).
558+
559After running this `git push` on the `satellite` machine, you would
560ssh into the `mothership` and run `git merge` there to complete the
561emulation of `git pull` that were run on `mothership` to pull changes
562made on `satellite`.
Junio C Hamano6926bef2007-06-16 09:54:05563
Junio C Hamano16ebcd02011-08-05 00:05:45564`git push origin HEAD:master`::
Junio C Hamano8b6e23b2009-02-01 06:36:08565Push the current branch to the remote ref matching `master` in the
566`origin` repository. This form is convenient to push the current
567branch without thinking about its local name.
568
Junio C Hamano16ebcd02011-08-05 00:05:45569`git push origin master:refs/heads/experimental`::
Junio C Hamanobfd4f9a2007-09-06 08:52:44570Create the branch `experimental` in the `origin` repository
Junio C Hamanoa9aee782008-04-23 16:09:20571by copying the current `master` branch. This form is only
572needed to create a new branch or tag in the remote repository when
573the local name and the remote name are different; otherwise,
574the ref name on its own will work.
Junio C Hamanobfd4f9a2007-09-06 08:52:44575
Junio C Hamano16ebcd02011-08-05 00:05:45576`git push origin :experimental`::
Junio C Hamano8b6e23b2009-02-01 06:36:08577Find a ref that matches `experimental` in the `origin` repository
578(e.g. `refs/heads/experimental`), and delete it.
579
Junio C Hamanob76a6862012-05-02 22:02:46580`git push origin +dev:master`::
Junio C Hamanod533bdb2009-02-25 09:56:58581Update the origin repository's master branch with the dev branch,
Junio C Hamano3f680f32009-11-16 02:10:54582allowing non-fast-forward updates. *This can leave unreferenced
Junio C Hamanod533bdb2009-02-25 09:56:58583commits dangling in the origin repository.* Consider the
Junio C Hamano3f680f32009-11-16 02:10:54584following situation, where a fast-forward is not possible:
Junio C Hamanod533bdb2009-02-25 09:56:58585+
586----
587 o---o---o---A---B origin/master
588 \
589 X---Y---Z dev
590----
591+
592The above command would change the origin repository to
593+
594----
595 A---B (unnamed branch)
596 /
597 o---o---o---X---Y---Z master
598----
599+
600Commits A and B would no longer belong to a branch with a symbolic name,
601and so would be unreachable. As such, these commits would be removed by
602a `git gc` command on the origin repository.
603
Junio C Hamano56ace3d2017-01-10 23:43:41604include::transfer-data-leaks.txt[]
605
Junio C Hamano1a4e8412005-12-27 08:17:23606GIT
607---
Junio C Hamanof7c042d2008-06-06 22:50:53608Part of the linkgit:git[1] suite